Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 4 Dec 2011 08:03:32 +0000 (00:03 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 4 Dec 2011 08:03:32 +0000 (00:03 -0800)
commit87258fd96736551dc0f1af637ea08d13b2bea7f4
treedc55264403ee4fa35539161bdb77b4e22947944e
parentf6fbc84e8d005f19488eeebf4b2d6398065200ba
parentc05d2e511ae55771d54d557c88cbe84bd91f3d71
Merge from trunk.